page setup: Add api to serialize to a GVariant

This will be useful for portalized print support.

https://bugzilla.gnome.org/show_bug.cgi?id=768499

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 9921b53b890f6c552a8232d3aa9bff5a1a192b33..0d02cd4413e3687bbee252bdde096e51a96d1881 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -7373,10 +7373,13 @@ gtk_page_setup_get_page_height
 <SUBSECTION Serialization>
 gtk_page_setup_new_from_file
 gtk_page_setup_new_from_key_file
+gtk_page_setup_new_from_gvariant
 gtk_page_setup_load_file
 gtk_page_setup_load_key_file
 gtk_page_setup_to_file
 gtk_page_setup_to_key_file
+gtk_page_setup_to_gvariant
+
 <SUBSECTION Standard>
 GTK_TYPE_PAGE_SETUP
 GTK_PAGE_SETUP

diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index aa957030898a9ff4f79785c478e6bdeef0d0e22d..9c81343745b8c5843cfe88bd85035cafe5797270 100644 (file)
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -837,3 +837,86 @@ gtk_page_setup_to_key_file (GtkPageSetup *setup,
                         "Orientation", orientation);
   g_free (orientation);
 }
+
+/**
+ * gtk_page_setup_to_gvariant:
+ * @setup: a #GtkPageSetup
+ *
+ * Serialize page setup to an a{sv} variant.
+ *
+ * Return: (transfer none): a new, floating, #GVariant
+ *
+ * Since: 3.22
+ */
+GVariant *
+gtk_page_setup_to_gvariant (GtkPageSetup *setup)
+{
+  GtkPaperSize *paper_size;
+  GVariant *variant;
+  int i;
+  GVariantBuilder builder;
+  char *orientation;
+
+  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+
+  paper_size = gtk_page_setup_get_paper_size (setup);
+
+  variant = g_variant_ref_sink (gtk_paper_size_to_gvariant (paper_size));
+  for (i = 0; i < g_variant_n_children (variant); i++)
+    g_variant_builder_add_value (&builder, g_variant_get_child_value (variant, i));
+  g_variant_unref (variant);
+
+  g_variant_builder_add (&builder, "{sv}", "MarginTop", g_variant_new_double (gtk_page_setup_get_top_margin (setup, GTK_UNIT_MM)));
+  g_variant_builder_add (&builder, "{sv}", "MarginBottom", g_variant_new_double (gtk_page_setup_get_bottom_margin (setup, GTK_UNIT_MM)));
+  g_variant_builder_add (&builder, "{sv}", "MarginLeft", g_variant_new_double (gtk_page_setup_get_left_margin (setup, GTK_UNIT_MM)));
+  g_variant_builder_add (&builder, "{sv}", "MarginRight", g_variant_new_double (gtk_page_setup_get_right_margin (setup, GTK_UNIT_MM)));
+
+  orientation = enum_to_string (GTK_TYPE_PAGE_ORIENTATION,
+                                gtk_page_setup_get_orientation (setup));
+  g_variant_builder_add (&builder, "{sv}", "Orientation", g_variant_new_take_string (orientation));
+
+  return g_variant_builder_end (&builder);
+}
+
+/**
+ * gtk_page_setup_new_from_gvariant:
+ * @variant: an a{sv} #GVariant
+ *
+ * Desrialize a page setup from an a{sv} variant in
+ * the format produced by gtk_page_setup_to_gvariant().
+ *
+ * Returns: (transfer full): a new #GtkPageSetup object
+ *
+ * Since: 3.22
+ */
+GtkPageSetup *
+gtk_page_setup_new_from_gvariant (GVariant *variant)
+{
+  GtkPageSetup *setup;
+  const char *orientation;
+  gdouble margin;
+  GtkPaperSize *paper_size;
+
+  g_return_val_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_VARDICT), NULL);
+
+  setup = gtk_page_setup_new ();
+
+  paper_size = gtk_paper_size_new_from_gvariant (variant);
+  gtk_page_setup_set_paper_size (setup, paper_size);
+  gtk_paper_size_free (paper_size);
+
+  if (g_variant_lookup (variant, "MarginTop", "d", &margin))
+    gtk_page_setup_set_top_margin (setup, margin, GTK_UNIT_MM);
+  if (g_variant_lookup (variant, "MarginBottom", "d", &margin))
+    gtk_page_setup_set_bottom_margin (setup, margin, GTK_UNIT_MM);
+  if (g_variant_lookup (variant, "MarginLeft", "d", &margin))
+    gtk_page_setup_set_left_margin (setup, margin, GTK_UNIT_MM);
+  if (g_variant_lookup (variant, "MarginRight", "d", &margin))
+    gtk_page_setup_set_right_margin (setup, margin, GTK_UNIT_MM);
+
+  if (g_variant_lookup (variant, "Orientation", "&s", &orientation))
+    gtk_page_setup_set_orientation (setup, string_to_enum (GTK_TYPE_PAGE_ORIENTATION,
+                                                           orientation));
+
+  return setup;
+}

diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 559ae439d6de8ca47044a37a4dabf71c66f61779..f6474f53a903a02ce6e82798da699a5f6082a131 100644 (file)
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -127,6 +127,11 @@ void                  gtk_page_setup_to_key_file       (GtkPageSetup        *setup,
                                                     GKeyFile            *key_file,
                                                     const gchar         *group_name);
 
+GDK_AVAILABLE_IN_3_22
+GVariant          *gtk_page_setup_to_gvariant       (GtkPageSetup        *setup);
+GDK_AVAILABLE_IN_3_22
+GtkPageSetup      *gtk_page_setup_new_from_gvariant (GVariant            *variant);
+
 G_END_DECLS
 
 #endif /* __GTK_PAGE_SETUP_H__ */